patch fix to #6