I am quite certain it should work this time..

Perhaps I should add a test..