very hack but fixes prevents breaks for now... time to move to vpc.