Oleksiy Yakovenko patch