Fix #379 - Finial update to make sure action is safe as well as view