Small fix from merged code