Fix for special attributes