fix - remove conditional logic