closed 1521 + small fix