Fixed bug with actions being called