Issue#16 Fixed bug