FIX: bug 4