Fixing last helper for the static removal.