Fixed to work well in Apache