Fix reverted commit 00a227