Fixing ticket 80