Wait for class fixed