Created by: jailuthra
Purpose of proposed changes
Fix #606 (closed)
Essential steps taken
Pattern found but no testing done.