subscription bugfix