fixed some missing