Build safe (22/40)

Build safe