Fix for TFL API change