Bug fix with traveling