Fixing multipart condition.