HACK FIX FOR RECENTS CAST EXCEPTION - TODO: XML EDITS, ALL SMART-LIKE

Change-Id: I136ef1d48f444fb6a2818b5314a4d2346a617157