Another fix for key