SCAN - fix for some ugly KeyError