Class cast exception removed