Bug fix from previous commit