Fix #249 (2)