Better fix for ' to ' problem