Fixed broken helpers
Previous commit was faulty