cleanup, fix possible issue