FIX: bug in subsciption