Fix for new repo structure