fixed some missing calls