Fixing arrow functionality with patch.