#1 Fix unresolved dirty class