fix on subscribe