Hack around the path problem, not the final solution