Optimize right to left compatibility

Fix for issue #1413