Fix from previous commit