Too many hacks to fix overlap problem.