Quickfix #17