[FIX BUG #16]