Fixing ticket 9