Further fix for #180