Fix commit 8aefa2504e0ab6bdcafc4dc1aabbd1c342734170