Lost some code in previous commit