Fix a bug introduced in previous commit. This should also fix issue #25
(at least partly ; at any rate it needs checking).