[General] Fixed #336