Bah, remove the conditionals...