Added hack to get subscription working