fixed before submit logic
Release v0.5.4