Fix bug expansion