added fix for bug-2231