bug fixes issue 223