#16 Fixed bug.