additional fix #3