Quick fix for opal master