CHRONX-14 Reverted previous solution, implemented a new one based on Peter's suggestions