bug fix @ 20141202