Merge error fix with master