@Mamute: Fixes #107.