Resolve previous commit issue