Patched some Bugs with handling actions