Fixed for 1.7-->1.6 (removed String switch)