Subscribe bugfix