Ticket 15 de Desk a Lap, Fixes #15