Issue271

fixes issue271