Bug fix (#236)