@Mamute: Fixes #121.