additional fix #6