Fixing Issue 461

Fixing https://github.com/michaelhidalgo/Dev/tree/Issue_461