Pushed the 'dafuq' bugfix