additional fix #2