Assets BUG FIX