Correct UNHANDLED ACTION REQUESTED issue #18