Release build fixing Issue #30;