Fix #087