Adding workaround for route