#60 FIxes