Fix action listener