Fix for static versions