Fix for bug #343