Fix for bug #485