fixes 27, fixes 29