fixes issues 92 and 96