Fix for page edit issue