Fixes TPA command + closes #36.