Merge "Fix monkey bug"