Fix #286
Fix #287