Issue/274

I'd add a unit test for this, it's very easy.