0.3.9 - end safe