a bug fix to v1 that will be merged to v2