Fixes issue 1 of #215