Possible fix for #405
Merge pull request #406 from ctrlaltca/fix_405

Fix for #405