#219: hot fix