Created by: remon-nashid
This small change fixes #1085 (closed). Basically it includes @gaearon's suggested fix.