Fixes 264 - undefined / 'undefined'