Fix #249 (3)