fixed subscription issue