fixed bug related to not calling .toUpperCase(). Also temp fix for
annoying decoder crash on one device.