* #365 fixed a last issue