Fix #249
Fix #249