Fix for bug #13