fix bug with subscription