* #372 final fix