@Mamute: Fix #46.