@Mamute: Fix #69.