Further fix for prematurely merged commit