Further fix to #228