Fix/hmc workflow

Refs. #941