Fix point 2 in bug #1001264

Testing in dev
Merge pull request #137 from almossawi/master

Fix point 2 in bug #1001264