Fixed issue 31,32,28,29