Fixed multiple adding of conditions