implement #25. No chance to test :-(