Fix non-pi operation