Workaround of last 2-commits