@Mamute: Fix #16.