Fix for #141 (again)