Desktop bug fix