Strict bug fix