Add a feature to implement #930

see #930