Fixed legacy action mapping