Commit after mapping issue resolved