Added now a proper fix for race condition issue with pages