Temporary possible bug fix?