Fixing issues 51 and 60