Fix for lost work due to bad merge