Mishandling. Return to pervious version with A247 fixed