Bug fix

Fixed conflict with previous commit.