Fix #26

M