Actually, this should fix issue #10...