FIX: bug 5