New quickfix to #924