Fix previous commit problems