Removed conditional for testing tracking state.
This fixes #23