Opera/Maple fix