Fixed bug introduced in commit 57eb9e12e5c82d8dba5b09254256f5bbf1e7c82d
(cherry picked from commit 5516c6420511f0b33791348074bffd3d6d352202)