@Mamute: Fix #52.