FIX: partially solve #4