Track fixed

Fixed #39