Fixing commit f1054f8f