Fix for the static version