Fixed #458
merge