Thank you @Nathaniel. Above patch works fine.