Fix broken master

Hack to fix master