Fix for new repository layout