Fixed issue with route handler