another try to solve #1557