Add workaround for strange update problem