fixes issue #563 

Michael OTS review