implemented #1028