*fixed issues