Updated for ticket #11