Fixed #356