HOPKINS: Missing modifications in previous commit