Fix bug in expander.