Fix an issue with multiple dropped keys