Bugfix: correct assumptions in subs.