#496 - Finished ticket.