try to implement #1479