fixes on the way