I think you can strip somehow this change...