fix non-debug mode (amend to v0.5.4)