another quickfix #2