add patch get-rid-of-code-duplication