fixed issues/12