FIX BUG 294