some strange fixes