BUG FIX PATRICK