Improved internal event subscribing & fixed event bug introduced in v1.3.21