@Mamute: Fixes #104.