Review and fix for 12-6