Fixed handling issues.