Previous commit fix