Fix remaining bug