bug fix #485