@Mamute: Fix #58.