fixing possible issue