fixing subscribe