Fixed as per latest PR