Finally fixed bugs?