Fix bad code. POC is good