fixes issue 55