#548 implemented, but not tested