[TW186] - Rectify last commit for Princes with a different approach