There is a bug somewhere!!!
Cleaned up