Second attempt Fix #162