Fixed bug #20 better.