Modifying your code is likely the best option if you have the resources and time to do so, but this solution sounds like its both faster and easier. Perhaps it'd be best to use this option as a quick fix and in the meantime update your code?