Removed not_if as it caused some unexpected behaviour