Fix for editing / removing in progress...