bugfixes for TAPModel