Small bug fix. Surely there are still a few bugs there.