Fix #295