substate support (issue #228)