Fix place under and code generation