Fixed Encapsulation comma-parsing bug