@Mamute: Fix #49 Fix #50.