Temporary bug fix