fixed bugs?