fixed mixed up between two intent handlers