strange fixes. Maybe I messed up with merging