Minor bugfix with this and the previous commit