Finally fixed ace issues