feature #67