Bug fix with code builders