Fixed #320