Fix for #41 and a relevant unit test