Using internals which may not be visible #738 (#739) (#758)Co-authored-by: Dennis Huebner <dennis.huebner@gmail.com>