bug fix on the v1
branch merge