Fix several answer possible - part 2