@Mamute: Fixes #100.