Fix populate bug
Fix populate bug