Small fix which might save a lot of pain