More fix for the static version