Fix for destination matches not being proper