[FIX] Closes #3