THE Bugfix Commit™

Closes #284, fixes #283, close #264