Fix #1095