Fix corner case for blank keys