Fix for Curse Ticket: #15