@Mamute: Fixes #108.