Attempt to closes fixes issue 128