Bugfix. #4 is not fixed. Damnit.