Fix for bug #11