Make sure actions aren't generic
Fixed a bug with else if