fixed issues 350 358