@Mamute: Fixes #91.