FIX: bug 2