FIX: bug 3