@Mamute: Fixes #105.