Fix for Make vs. MakeAPI