Add manual version to workaround bad compiler 'optimizations'