Fix #364 added