Issue 405

This will fix #405 and will stop #392 from happening for real.