Fixing commit 7017ec7f3