Quickfix to get master-1 running