@Mamute: Fixes #125.