[COMMIT] last part of behavior patch