0612-6-fix