Other option is to implement #1192