Custom subscription bugfix