BUG FIXES WOO