Fixing Problems with ClassCast Exception - TRUNK-4053
Merge pull request #398 from dkayiwa/TRUNK-4053

Fixing Problems with ClassCast Exception - TRUNK-4053