1.2.4 Bug fix for subscribe