Commit - fix error data not load