Fixes issues 58,59, and 61