Removed part 2 of condition. Functionality change.