Possible bug fix for a strange issue