Fix for bug #5.