next fixes on #50