Fix for changes made yesterday