Code

Followup commit for #774