@Mamute: Fix #55.