Merge "Fix bug."