#559 fixed
#558 Fixed