Missing code to #4

:blush: