#20 another quickfix