@Mamute: Fixes #122.