Fixed Master's mistakes