Quickfix to get it running