Fix for 6634