Fixed #422