now REALLY fixed everythin