closed #2307 - #2318