Possible fixes for #455 - needs unit test before signoff