Fixes #50
Bug was introduced here: d0cec0f494e62999402420e947e294c944d372b9

What's to point in pushing unfinished, buggy code to the master?