I have used the patch #24, And it worked fine.