this todo has been completed by @xenover in 9add64866bee2a265d415c37a9a4ace00abe55b6