Feature #262 partial