Fix for 10.7 - closes issue #2