trying to fix mess