Apply fix for .class - #537 #447