Bugfix for stateless variable computation