shape fix: states return callables