#28 extra fixes