Fix #26