Fixed reordered override and custom