Fixing ticket 220
Fixing ticket fix-220