Actually fixed subscription issue...