BugFix to spikes_removal_tool, diagnosis part