Bug fix regarding subscription