Fix for previous changes