Changes pushed by applying the suggestion from the patch manually and fixed a...