fixed bugs once again