Fix issue 8 reported by Martin Ettl.