Fixing subscriptions
Version 0.3.1