Fixing ticket #2