Fixed broken dependency for always classes