Quick & dirty fix for missing key error