Re-committing calculator. Should work now. Hopefully