Fix action listener issue. Authors: nmcmahon1215 dbourque3 notcras