@Mamute: Fixes #120.