Fixed bug in key master (again)