fixed some structure