Squashed one bug, there are still others