closed #2489 closed #2490 closed #2491