[#67499024] modified to use delegate initializer