Fix issue with shiping modules (#960)