Converted from Q to when
v1.3.0