Fix embarassing #551

This is a regression introduced in a7ec825f8dbc3c7a3fcb7a91617c0d623105125e (pre 1.0.0)
Update CHANGES
Add a regression test for #551