[FIX] closes #2