Fix bug
Add subscription in class