Fix broken build #516