#25 fixed, the update is correctly implemented cross environment