closed #1611 + small fix