Fixed issue25 and tested