Fix merge patch

This will fix this patch to allow it to catch what it should catch and allow those that are legal.