Fixes bug #136 from Sebastian