Created by: jailuthra
Purpose of proposed changes
Fix #603 (closed)
Essential steps taken
No testing done