Well that additional if statement was pointless...