Possible further fix for #128