Missing code for #4

:blush: