@Mamute: Fixes #118.