@Mamute: Fixes #44.