A simple fix

I swear the tests pass this time ;)

Ref: #1126