Fix broken build #512