Fised small bug, close issue #7