Build safe (34/40)

Build safe