fix for the cleanup