https://github.com/kraih/mojo/issues/442/
update Changes (Workaround)