apply fix for reopening class instead of class/module clash.