conintued fixes