back on develop branch to fix #1096