ANOTHER BUG FIX.