Fix that should get rid of weird bug for good