@Mamute: Fix #40.