bug fix for v1.2