#636 - Finished ticket.