Fix for bug #66