[General] Fixed #357