Fix decorator issues apply class