fixed subscription yet again