Fix for bug #4