Better fix related to commit e6f00d9157aa2d0a8cb401a384f6d95d44b64d79