DEV: Fix for release build