fix for Opal