Fix non-debug mode