Fix for better compatibility with Page object extension