- solving some bugs on the reply