Updated helper for 1.2.0