Hopefully will fix subscriber problem