Fixing issue 215

I don't know, does this code makes sense?

I would like to test it, but I don't know how to do it properly