fixed issues 1