Fixes for Subscribtion