Additional fix to Issues #68