@Mamute: Fixes #103.