Workaround for bad memory access
Update version