001 bug fix version 2