This commit fix #3