Fix #124 on develop