Fixed classResolved called when not needed