fixes issue 60