#6 #midgart fixes