Bug-fix on default actions