final fix for weird things