Fixing commit f7e3652