Implemented #1308