@Mamute: Fixes #142.