Solve bug #50