- fixed issues