Fixing #2

A rebased version of #3