Add a static version to avoid virtual dispatch

Add a static version to avoid virtual dispatch #1370