- fixed problem found by Daniel review