Fixed #374