The patch that you have mentioned, works correctly and address your mentioned...