[FIX] Closes #41