[FIX] Closes #44