Fix #236