Fixed issue with Subcription