Merge: Mkdir fix