bug fixes for tracking