Fix for bug #11 - last change was wrong