adding @mafintosh's great fix