second fix of same as before hæhæhæhæ