[FIX] Closes #19